40c700515e154c2d3a7f1a21b356b342009581b7,opennms-model/src/test/java/org/opennms/netmgt/model/topology/DefaultBridgeTopologyTest.java,DefaultBridgeTopologyTest,testTwoConnectedBridgeTopologyBC,#,732

Before Change


        bridgeTopology.parseBFT(topology.nodeB,topology.bftB);
        bridgeTopology.parseBFT(topology.nodeC,topology.bftC);

        List<BridgeTopologyLink> links = bridgeTopology.getTopology();
        printBridgeTopologyLinks(links);
        assertEquals(4, links.size());
        for (BridgeTopologyLink link: links) {
        	if (link.getMacs().isEmpty()) {
        		assertEquals(topology.nodeB, link.getBridgeTopologyPort().getNodeid());
        		assertEquals(topology.portBC,link.getBridgeTopologyPort().getBridgePort());
        		assertEquals(topology.nodeC, link.getDesignateBridgePort().getNodeid());
        		assertEquals(topology.portCB,link.getDesignateBridgePort().getBridgePort());
    		} else if (link.getMacs().contains(topology.mac1)) {
        		assertEquals(1, link.getMacs().size());
        		assertEquals(topology.nodeB, link.getBridgeTopologyPort().getNodeid());
        		assertEquals(topology.portBA,link.getBridgeTopologyPort().getBridgePort());
        		assertEquals(null, link.getDesignateBridgePort());
       		} else if (link.getMacs().contains(topology.mac2)) {
        		assertEquals(1, link.getMacs().size());
        		assertEquals(topology.nodeB, link.getBridgeTopologyPort().getNodeid());
        		assertEquals(topology.portB,link.getBridgeTopologyPort().getBridgePort());
        		assertEquals(null, link.getDesignateBridgePort());
       		} else if (link.getMacs().contains(topology.mac3)) {
        		assertEquals(1, link.getMacs().size());
        		assertEquals(topology.nodeC, link.getBridgeTopologyPort().getNodeid());
        		assertEquals(topology.portC,link.getBridgeTopologyPort().getBridgePort());
        		assertEquals(null, link.getDesignateBridgePort());
    		} else {
    			assertEquals(false, true);
    		}
        }
	}

After Change



	@Test
	public void testTwoConnectedBridgeTopologyBC() {
		ABCTopology topology = new ABCTopology();

        BridgeTopology bridgeTopology = new BridgeTopology();
        
        bridgeTopology.parseBFT(topology.nodeB,topology.bftB);
        bridgeTopology.parseBFT(topology.nodeC,topology.bftC);

        topology.checkBC(bridgeTopology.getTopology());
	}

	@Test